From: Bernd Zeimetz Date: Sat, 21 Dec 2019 22:43:51 +0000 (+0100) Subject: Install gmapbase.html. X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~84 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=a1fdee889c9b4f90fe4cefd86a9ef0106a17089c;p=gpsbabel.git Install gmapbase.html. Also patch a useful path into gpsbabelfe. LP: #1015886 --- diff --git a/debian/gpsbabel-gui.install b/debian/gpsbabel-gui.install index c093b335a..30392ad1b 100644 --- a/debian/gpsbabel-gui.install +++ b/debian/gpsbabel-gui.install @@ -1,3 +1,4 @@ gui/objects/gpsbabelfe /usr/bin debian/gpsbabel.xpm /usr/share/pixmaps gui/gpsbabel.desktop /usr/share/applications +gui/gmapbase.html /usr/share/gpsbabel diff --git a/debian/patches/gmapbase.html-location b/debian/patches/gmapbase.html-location new file mode 100644 index 000000000..bbfe44cdd --- /dev/null +++ b/debian/patches/gmapbase.html-location @@ -0,0 +1,11 @@ +--- a/gui/map.cc ++++ b/gui/map.cc +@@ -90,7 +90,7 @@ Map::Map(QWidget* parent, + connect(mclicker, SIGNAL(logTime(QString)), this, SLOT(logTime(QString))); + #endif + +- QString baseFile = QApplication::applicationDirPath() + "/gmapbase.html"; ++ QString baseFile = "/usr/share/gpsbabel/gmapbase.html"; + if (!QFile(baseFile).exists()) { + QMessageBox::critical(nullptr, appName, + tr("Missing \"gmapbase.html\" file. Check installation")); diff --git a/debian/patches/series b/debian/patches/series index 64be84137..f9753b992 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -10,3 +10,4 @@ htmldoc-location 0010-Fix-manpage-xml.patch cross.patch 0012-The-lezyne-super-gps-every-10th-ride-or-so-outputs-a.patch +gmapbase.html-location